[WIP] Annotated completions #711
Conversation
| (Completable.Cexpression | ||
| {contextPath = ctxPath; prefix = ""; nested = []}) | ||
| | _ -> ()) | ||
| | {pvb_pat; pvb_expr} when locHasCursor pvb_pat.ppat_loc -> ( |
There was a problem hiding this comment.
Is it clear that this case cannot be an instance of the cases above? Are we relying on the order of cases?
There was a problem hiding this comment.
I'm fairly sure we're not depending on the ordering, but we're getting dangerously close...
| @@ -296,6 +294,36 @@ end | |||
|
|
|||
| type polyVariantConstructor = {name: string; args: Types.type_expr list} | |||
|
|
|||
| (** An type that can be used to drive completion *) | |||
| type completionType = | |||
There was a problem hiding this comment.
How about factoring out env? Seems to be present in every case.
There was a problem hiding this comment.
Yes, that's a good idea. I'll need to have a deep look at how env is passed around, where it's needed, etc. Ok with you if I do that in a separate PR?
| @@ -582,8 +584,22 @@ let completionsGetTypeEnv = function | |||
| | {Completion.kind = Field ({typ}, _); env} :: _ -> Some (typ, env) | |||
| | _ -> None | |||
|
|
|||
| let completionsGetCompletionType ~full = function | |||
There was a problem hiding this comment.
Every case seems to return the same env. Factor out?
| | Tuple of QueryEnv.t * Types.type_expr list * Types.type_expr | ||
| | Toption of QueryEnv.t * completionType | ||
| | Tbool of QueryEnv.t | ||
| | Tarray of QueryEnv.t * completionType |
There was a problem hiding this comment.
Looking at env in the nested case, e.g. in the argument to Tarray.
It seems to me, from a cursory look, that the inner env might always be the same as the outer env.
If true in general, then factoring out the env in the type definition means it does not need to appear in the argument of Tarray etc.
I haven't really checked that this is true for all cases. If it is true, then the overall type would be:
{env; desc} where desc would be the recursive definition of the variant cases. So e.g. Tarray of desc would not include the env.
Completion via annotations. E.g:
let x: someVariant = O<com>completes for the variantsomeVariant, even if the let assignment hasn't compiled previously.Only handles "basic" types as of now. No handling of options etc.
Currently quite messy, but looking for your feedback before I continue @cristianoc .